minor rename of functions as well as the first resource test using mocks