Add some missing tests
Version 2.2