Removed test comments - ORIGINAL version