Test improvements

Three improvments so that compile-errors might be found earlier.