More tinkering with test figure