Refactoring test/ directory to divide tests up into types