Address CR comments + unit test fixes