More unit tests and fixed datatypes for classes