Added some misc trivial classes and tests