Merge pull request #1156 from tiyowan/feature/unit-tests

Fix test errors in Loader_test.php and URI_test.php