Moved unit test in its own directory