Address comment + add tests