Adopt tests to new signature