Added some basic classes with some tests