Added support for common.bnd
Update tests