Merge "Move libraries for unit-tests to separate folder"