Language magic removed and tests added