Corrected the test methods
Fixed conflicts