Fix broken coffeescript merge
Fix two-database test to avoid queries outside of transactions and increase the chances truely interleaved queries (open database takes much longer than run a query)