Test and fix functionality of main branch