Test Environment Bug fixes