Move tests together
WIP for matcher-project