removed test base class
cleaned up comments