Got a few more unit tests working.