consolidated testing code
addressing code review