spec refactor

let's try not to test a bajillion things in a single spec :P