Add two imports to fix compile break in test