fixed broken tests. all tests pass
fixing tests
fixed merge conflict on submission response