clean up testing
update function names