#6: New tests location. Work in progress.