Moved unit-test to proper folder