separated Decorator tests into unit and functional tests
renamed methods