complete tests' move to classes