More work on testing code