Refactored Resources and Test pass