Moved the unit-tests folder in to the correct location Change-Id: I36bad4aea26ab2425e4b1b6bb2fea1d3be26548e