Testing and fixing issues