Fixed some of the old tests/database