Split test file, fixed missing include in header