Started refactoring tests into test suite