Add Adam's unit tests