moved tests into a single directory.