Worked on PECAS-109
Finished tests from feature-109
Refactoring PECAS-109 and formatting
Merge branch 'feature-109' into develop