Adds more tests for #18