fixed tests to include new changes