Further cleanup of tests