Refactoring test:

Made it fit our style guide and deleted pointless comments.

Haven't added any comments for high/low-level stuff as it's mostly self
explanatory.