Add fixtures
Remove unused base class