Fixed remaining tests (I hope)