Update project and tests