Fixing test errors