added some more tests, implemented better population