Added protect path, working on tests