merge cleanup
conv currency tests