Fixed use of `this`/`self` (cf. guidelines), use of `new`, and test names (and some inconsistencies e.g. spacing)