Refactor of test classes.