Fixed additional failing tests before push for demo