Yeah, pull request this stuff!

Also fixed the broken test files.