Add CBU model and some test structure