Fixed decorator bugs found in tests