Add unittest as separate file
Revert to original verison of test file