Add a couple more tests for completeness