Cleaned up specs to follow jasmine paradigm better