Minor test changes
Resource changes