test 6 fixes: #1