Fixed tests that wrongly assumed the old database schema