Fixed one test; closer to async implementation