Refined random seed, added a couple more types to tests