[FIX] clean up, reenabled tests