a lot more test specs and commenting