Fixes tests when there is no DB
Adds world tracking to DB