Fixing up dependencies, disabling TestMessages since it has an error I can't figure out