Unit tests are failing, develop branch