couple of fixes, more test environment