restructure of decorator test
fixed issue #4