merge @luciansmith testing changes
fixes for testing
fixes for testing