Adapt the test to our current functionality