Fix Data scheme bug, update tests