Refactored small test changes