cleanup test and shape