Ok everything seems to work now, we've cleaned up some of tests