Clean up state tests