Ben's comment + tests added