Added several original tests from thesis.