more tests working

Change-Id: I8d1477e62cb13f76d0c3878379e754f5158500dd
more tests

Change-Id: Id9f9af17d7bd084943f8ade2e31b4e34ebf89ef4