more tests + correcting resourceName handling