#362 - CR updates and improved unit test