Get more test passing