additional testing in place
fixes