Changed conditional in spec, added remove class spec