fixed tests for new changes