Added acceptance test and partial solution