Refactor - SIG get 5 stars

In order to get a 5 star rating, the following issues need to be resolved (ignore tests)

Priority - High

Needs to be finished by the end of the week

Definition of done

When the failures above are no longer failures.