cleaned up spec and made it run on 1.8