FIX: Fixing testing error, improving doc