Get rid of database-test macro
Get rid of database-test-all