Functional tests fixes, minor fixes in moosh.php
conflicts