Week 6 completed, refactored specs