added/improved unittests