Moved unit test to a separate file