Merge pull request #19 from qadan/7.x

7.x tests
More things we aren't handling correctly.
Define a variable before referencing it.
Merge pull request #22 from jordandukart/7.x-qa-dan-stop-doing-your-job-so-well

More things we aren't handling correctly.
Merge pull request #6 from Islandora/7.x

7.x update