Add some more -f functions that take a test?