Fixed unit tests

Commented out those that were obsoleted by new Resource classes.
I still need to add unit tests for the Resource classes.