some more..
moved tests