Revert "Implemented suggestions by JohnLambe."

This reverts commit 701a88926938606a3769d198f4afec051855f51e.
Revert "Made a correction on line 73 of DatabaseTest class."

This reverts commit bbd5f1707abb464198c6ca3721bbda7fdcdf97d3.