Moved tests where they belong.