clean up before Sam's review

Wanna switch to using doubles? The yucky scaffolded test isn't isolated from the database ...