Made workflow test class cleaner, moved other stuff elsewhere