Latest tests-related refactoring & improvments.