Merge "Re-enable tests that were disabled due to bug #1623576"