Working on more unit tests and fixing irregularities.