Modifications to test helpers