I'll review the tests more closely once we fix the other issues