Added rest of testing