tweaked some tests