Fix spec
Moved methods to a different file for tests
Dem specs