acceptance test refactored
spoec refactored