Working on a few more tests.