fixed tests to work with the new implementations