Tests now more comprehensive, better module management
Plugin work