Fix All and Core tests