Added additional unit test and excluded some static classes.