More testing

This PR is polluted with merge commits. Somehow github wasn't register your manual merge in the history. Maybe because it was merge across forks.