ADDED: json support for Surface class
DELETED: old testcase