clean up
add populateTests