Test fixes

I changed the strand of my test cases and didn't propagate that fully in
the last commit.
Added testing file, deleted old lines