test: Adapted existing tests.