reorganize tests in spec to read a little better