US538 - fix pending tests