Rejigged the tests and examples to be more real world and useful