fix coverage gathering
statelocation
merge fix for test failures