All done and test seems to be passing without any hacks =D