apply fixes for failing tests - Thanks @witlessbird