Added partial tests, 4 outstanding