Test fixes courtesy of Phillip