Refactoring resources, fixed broken test.