slight fixes to tests