Added rest of tests.