Fix test 18
Fix test 20
Fix test 21
Fix #14