Finished fixing tests and environment.