Updated paths and tests to use those paths