added test classes, added support for static methods, new var names