Remove trailing whitespace and fix imports
Update tests
Update examples