Added some tests

Change-Id: I5970ad7441fc98bdfb6f8c332a473b26533d4782
Merge "Added some tests" into dev