Test code in preparation for Google Summer of Code project