minor testing changes; not finished
Fixed/improved test coverage