Use new version of type wrapper determination
Move refactored version to correct package
Add more test classes
Fix violation handler in test case