Added support for @DefaultValue
- Also added more test cases.