moved resources, refactored tests