Resolve first acceptance test.
Refactoring