Adding unit testing