Adding environment tests