Fixed resources list + added tests