Hopefully fixed test environment