Re-arrange files in spec/database.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>
Fix test suite.

Was broken due to addition of new test databases in commit "Add some databases
for testing".

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>