updates for REF-87 & 91, updated ADT tests
fixes for REF-87 & 91