moved files and improved tests