added unittests
removed temporarily