Add new tests
Fix test 18
Fix test 20