Minor composer tweak
Fixed tests
Merge pull request #379 from GrahamCampbell/composer

Minor Composer Tweak