Test fixing

fixed all failing tests