added more unit tests, refactored some classnames