fixed tests
fixing merge conflicts hw3