fix test for dupes + misc cleanup
add test for user filtering