Refactored and finished converting tests.