optimized exports
changed tests to cover DB-related challenge paths