Improve Unittests

refs #60