Update project and add guideline methods/tests