Ensure unique database name for each test

Revert to inline test style