Added some extra resource tests (now almost all service tested)