added student type classes, refactored Tests