Add fixes to tests