Implement exclude
Fix up some tests