Remove unnecessary include and add test