Trying to makes tests work sucks