Testing and cleaning up