added auto include and more unit tests