Add unit test, working