Adding test code (which I thought was already done...)