Sprint 1 and 2 - tests updated

Tests updated for stories in both Sprints 1 and 2. Now all fully running
green.