Updated the test suite with new structure and got rid of the needed bootstrap.