fix tests to use new database tag structure