Refactor spec to be more like real unit tests