fixing and tidying some tests