Remove calls to unit tests already tested