fix to tests failing, should pass 100% now