Fixes for see test library