All tests now pass with the new system