wip -added new tests.