Fixed the test, the main closures and modifies are now in place.