Initial work for unit tests