More patching, added decorators+edited test script