Tests' code clean-up.