Moved unit test to bundle