Added basic composer support
Fix for recursive testing