Tests: Minor code clean up