Fixes #1 Testing (Scrumwise task #690)