Fixed some problems with the combine keynote CommonFlow and some of the unit tests