Fixed tests and update paths