Testing and minor changes