Add comments and some more tests