Removed conflicting code
Merge pull request #645 from randomous/Unit-test-conflicts

Removed conflicting code