Decoupled TUPT tests and fixed some bugs while making them work again