Test suite: more improvments and test cases