Changed name of a test and improved implementation of other classes.