Move tests into own directory and restore all changes not related to this commit