Add more reject handling
Add tests