GH #229 - Brought back older tests.