Wrote tests for PECAS-110, PECAS-111
Refactor for PECAS-110, PECAS-111