Adds two more tests considered to be edge-cases. Nice-to-haves