#781 - all existing tests working