Fixing up basic test coverage