few fixes and test env