Fixed resource mocking to correctly use the sling:resourceType.
* testSlingResourceTypeIsLoaded
* testSlingResourceTypeDefaultsToJcrPrimaryType

Upgraded test libs and added hamcrest matchers to fix sem-broken tests
(white space due to windows/unix line endings)