Reverted test modification and fixed schema