Testing and setup fixes