minor changes, and removed tests per review comments

Change-Id: I0d38e02c072e5d4b6a353cda453db57f230a3683