Fixed test errors and added tests
Fixed methods and initialization tests