ENH: Adjust timeout for tests running under Valgrind

STYLE: Miscellaneous minor style fixes