Added a TestLevel and applied minor adjustments to some of the other classes.