ticket:#5 Changed imorts for prevent tests fail