include fix
test tweaks