moved tests where they belong