Fixed the tests and other configurations