Fixed test logic. Also: they pass now!