[BUILD] use consistent file names for test files
[FIX] missing include