Test fixes

Can you test this out and make sure it's green for you @stephsharp?