DGM-23 Moved tests to better package.