Move tests to unit directory

Change-Id: Idde6b29f78e507bd861edfe221574f1160259d1b