implement hooks to comform with tests, remove noop, respect undefined