Refactored tests organisation.