Added Tim Simmons' tests