Fixing unitest structure and bootsrap.php