Testfix + re-enable tests