Acceptance+Unit tests (aashishs and srg538)