Fixing test
More code translated