Move and rename tests

Also fixes a problem with the auth service spec.