Minor adjustments, tests only fail now and no longer error