Module.php cs
Initial fixes on tests
Some refs on test
Some cs fixes