fix cases
merge bareTApp cases