test 7 fixes: #1