I've seen some more tests in other files, including non-empty checks but I'd like @domcleal or @GregSutcliffe to give their opinion about that.