Add addition tests, move a few things around.