fixed some tests with the implementation change