Resolves #168, added database test suite