Resolved all tests