Clean up test example, minor fixes