well I guess your gunna have to put it all back to standard, then engineer it properly.
If they are offering to do the test for free Id have a go at it with the setup your running just make sure your cat and other emission equip is in good nick and your using a std gze ecu. the jap emission test would have probebly been as tough as the aussi one.