Test fixes

Two quick fixes I found using eastwood.