Refactored tests, made a little more concise. Added coverage to the EntLib tests.