Switched existing tests to framework Tests class.
Added coverage to tests.