Updates for testing setup