51205835 - clean up spec variables
51205835 - port class spec into helper
51205835 - port class spec into helper