rebuild tests
simplify fix for #53