Added unit tests (so far for class methods)