Contrains versions in Berksfile, test fixes