random_map almost workd. de_random works. Test added