Improve original author attribution
Add braces to  conditional statements
Fix tests when composer installs stable packages