Minor improvements

* Composer
* PHPCS
* Tests
* Fix the Variable Variable problem