unit and functional test update
minor improvements