clean test and shape