Imporved base test class. Renamed test functions. Small fixes.