add missing tests
fix leak; fix test
simplify