fixed type warning and tests updated
clean up