DataControlTest:
1) Some changes to code to ensure more tests and better code coverage