Cleanup.
More cleanup.
Try splitting specs into integration/unit folders.