Fixed a failing test from the merge, two still remain