Changed source file directories and removed build rules for some tests
Changed includes to look for localized files