Fix a shitload of tests (~20)