Fixing spring contexts and test package names.