Fixing tests for Issue #316