Cleanup specs #230