Fix Bare Metal Tests