Tests updated to use instantiable db