Added more to tests and added fig_system_env