Remove unused arguments from test
Ensure concrete class in test