updated marshaller and fixed test resource paths