added unittests