Add flatMap into the mix for TCK verification and fix few issues with it