Move my_tests to populate
Fix some bugs + some changes.