Cleaned up and prepared specs
Removed activerecord dependency
Ammending changes