Fixed Tests (I hope)