change test code for appropriate classes