Turned test into a class