#1649 - Test fixes