A lot of changes in tests related with new wrapper