Update tests to use TestPropsProvider, and correctly verify expected behaviour.