some fixes to tests