Started setup work for unit testing