Corrected extension files and tests