Add some more testing pieces to make things smoother