Also move tests to separate files which are auto-imported. This should allow people adding tests concurrently without introducing merge conflicts