Cleaned up boilerplate from test classes