Refactor all unit tests, remove redundant classes.