Enhanced test to include TestInitialize and Cleanup