cleaning some mess, moving tests files to another directory.