Restructure tests to reflect src