Better Example and Tests