Updated tests with common changes