Fix commerical unit tests