Support for 4.
Add more passing tests.