Fix tests path
Some minor fixes