fix
more unittesting