Updated paths, libs & tests