Changing datasource-config to Annotation-driven
Minor fixes, Test cases