Added more tests (and the code for them) using the examples you had above in 4f4636333675e3ea57a81ee83d850abfc4ee5614.