Add more tests for #5