Updated a few tests for more coverage