Cleanup tests a bit for the open source tag