Updated acceptance tests and prepared us for using code only packages to
keep up to date with the core