Update unit tests drop 2 6