Added classes and fixed failing specs