Code cleanup.
Fixed unit tests.
Merge branch 'master' into pr/n256_jogibear9988
Revert "In Oracle Reserved word's need to be masked!"

This reverts commit 1d5735fe5f200bf390159e26fcf8e83aef123601.