moved tests where they belong to