Refactor/major simplifications and test behaviors and sundry