Various post-testing changes