additional resource tests and improvements