Added test base class and test env flag