add some more test cases
change the class file object model a bit