Cleaned up various specs