fix test code to cope with new architecture