Supplementary classes to run JUnits Cleanly
Merging conflicts with Cory's Changes