added some missing tests and removed unused code
fixed naming issue where Resources vs Resource service