Swarchal add more test and pass them (towards #17)