Refactor acceptance test (include last version)