Looks like I missed out renaming 1 method earlier
Extra asserts to hunt down test failures