Add unit testing for common