fixed: controller.database()
updated: tests