DEVIDM-130: Rewrote tests