Changes in TestAlgorithm. Small changes in parsing.