Dbatiste/add unit tests