@AlinT - I made these changes and the test failed, so I removed them.