Fixed populator :(
Updated tests