Updated existing resources to latest version, added more tests