reapplied fix for "mismatch"
added extra extensions test and introduced a timeout to the test to detect hanging