rebar migration and test fix