remove unused tests;
Add api for rspec