refectored test moved to seprate package.