small fixes to tests