Add test base classes