Fix sample tests (still broken in actuator)