Added structure for unit testing