Everything but tests are working