Changed the populate methods slightly & and added missing tests for them