Added required file includes to test files