update test bed + fixes