Fixed some tests setup issues