still tweaking test rigs