Database properties in separate location
Added test cases