more test cases + classes added