Tests are still messy, but works better

... and show that the ResolveEvent call is actually working correctly.