fixes. adjusted test vars