refactored / extra assets added (Travis/phpunit)