Add test cases. Fix bug with {env, Options}