model Match stronger + add unit test for place + fix bug in Account Service