fixed some test issues from the base class change