:lipstick: Improve test readbility
:lipstick: Improve test readbility

georgeyk/quickstartup,osantana/quickstartup,georgeyk/quickstartup,osantana/quickstartup,georgeyk/quickstartup,osantana/quickstartup