Added basis for unit testing