Adding a couple tests for #4