test fixes: #1