updated test branch to fw/base and settings