Add missing schemes, add dependencies for OSX test