post merge cleanup and test fixes