Extended tests from UVA forum

Extended tests from UVA forum