Renamed some test functions.
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_collection into 7.x-rename

Conflicts:
	tests/islandora_basic_collection_ingest_purge.test
Merge pull request #61 from jonathangreen/7.x-rename

Renamed some test functions.