Updated tests, waiting for roaster patch for them to work =)