fixed test utils and some config