Cleanup and remove unrequired imports
Set behavior for multiple types
Rewrite tests
Test updates