Updated test code (which is not even stable)