Working on final test code