Better test coverage. Added stub methods.