Got rid of the test shape