Working on test code