Modify tests and code to fit BBB environment