#81 More tests, moved test types back into parent test class