Working on acceptance test