Testing and filename updates