Added small unit tests