Test Classes + small changes

See D2L for changes