Fixes and SpadDatabase tests.