Fixes all in
a little test cleanup