Updated project and fix Resource router test