added some extra tests, added extra classes