Sorting through and fixing some language tests