More work on base test. Add a few helper functions.