Complexify TCK verification and fix consume issues