Fixing most tests for common configuration
7 files changed