fixed a warning
fixed unit tests