Adding fixes to tests