Fixed all tests to pass

fixed all tests to pass.