#62, closes #63, adjust Algorithm constructor and tests