added more unit tests... will add even more unit tests.