Fix tc

Fix various TestCase bugs....