Dev test updates

update deftest branch