Some testing and changes to Environment.