test tweaks for g++