more examples, cleaned up tests, etc