files moved from /peterhm/gbd/book/
tests added