rewrote tests to fuzz test items for most tests