Moving tests to classes

Created subclasses for different categories of tests