Added another value test and did minor tweaks.