Fixed tests (I hope)