terraform: fixing more test cases