fix test weirdness
restore missed tests