clean up and modernize tests