Moved tests into test unit class.