Just some cleanup around testing.
Preparing release 4.0.0a1
Back to development: 4.0.0a2