Adhering to style guide
Updating tests to allow for SUIT style