New PR drag branch with beta code (previous branch diverged).
Fixed error with duplicate unit tests.