Martin

Implemented test cases for two runs of the style checker and refactored class derivation.