Add Tanay's test code