Test all modules, cleaned up syntax