adapt callable tests to new classes support