unit test fixes
notice fix