Add unit testing