Change table names and take care of some code coverage issues
Merge pull request #229 from Juniper/development1

Change table names and take care of some code coverage issues