Update 4 core test files