Move into "unit" subfolder
Add integration tests
Revert "Move into "unit" subfolder"

This reverts commit 351ac01833e0bcf7c466cec37512971fe127de72.
Fix unit tests