Add passing tests and remove helper spec file
Add passing tests and remove helper spec file