Started refactoring test suite to more terse format