Minor updates to simplify testing