Updated unit tests up to 99% coverage
Merge branch 'master' into PostgresMerge