Cleaning up unused test code
Slightly improving some test code