[ronald,monica] move stuff to other package, fix test