JASCIS-89: Test fixes