Move Class module to the tests