Add more classes, used spec helper