Smallfix: Added some deleted base class
Smallfix: Fixed the fixture
Smallfix: Removed an 'i'
Fixed the sample_data command