fixed tests to reflect changes