Some updates to make the test environment work