Testing and polish