QA: Code cleanup and some additional tests
Merge branch 'cleanup' into develop
Fix unit tests
Remove PHP 5.3.3 and 5.6 from Travis allowed failures and update composer.lock file.