Minor scene changes for easier testing