Merge pull request #314 from john-hill/develop

Fixed broken test