Added random combinations to unit tests