fixed uniform testing code