Jasonh/add some tests