re-enable test and re-enable tests that were failing