add missing tests
Merging