Add shape control, fix base test.