Add unit testing for added behaviors