added more unit tests. few minor tweaks.