Move tests to Tests class