Added/Stubed the rest of the tests.