Added more test
Added block methods for class resolving
Added block method for property parsing
refactoring