Proper random data for performance tests
Fixed bugs, added more tests
Fixed formatting
Put returnparams in base class