Fixed spec tests

Change-Id: I7405fb2da68896c368a90c4334b80d6761891ccc
Merge "Fixed spec tests" into red_black