NASDS
Resolved conflict in test lib