updating bombel tests to handle new code layout