improving mock, fixes