Clean up example/test a bit