test library, tweaks