Feature/add environment

@pupssman I fixed a typer in tests, why not?