GH #244 - Brought back older tests.