moved tests to OUnit2.