Fixed tests for new signature