Cancel TODOs to create common test base class