Turned spec test into a normal class