Remove TestState with awesome shapes