fix #42 -- complete testing