More tests…and a tiny bit of implementation, because I was going to go insane from the tests otherwise.