Test fixes. #55