Add helpful resolve method for when things go wonky
Add beginnings of some testing