Second commit
Add missing tests