Some tests have been updated, while other which are still a work in
progress have been marked with @pytest.mark.skip(reason="Test need to be updated")