upgrade a number of classes so that they will compile in arc mode, improve error detection in case where file does not exist, add extra time for test to run