modified/restructured test to follow standard format