jira ticket number 98

Signed-off-by: John Mulholland <john.mulholland@rsginc.com>
jira ticket number 97

Signed-off-by: John Mulholland <john.mulholland@rsginc.com>
Merge branch 'feature-97' into develop
Finished tests for PECAS-98

Signed-off-by: John Mulholland <john.mulholland@rsginc.com>
Reformatting and refactoring for PECAS-98

Signed-off-by: John Mulholland <john.mulholland@rsginc.com>
Merge branch 'feature-98' into develop
Refactored and improved test for PECAS-97

Signed-off-by: John Mulholland <john.mulholland@rsginc.com>
Merge branch 'feature-97' into develop