fixed tests from modifications