Get fixes to tests