Remove resolve and start cleaning up tests