remove test columns & refactor mbid getter