Updated testing dirs; added some tests.