Still bad Johnson dist acceptance; some tweaks to test funcs