chore(core, tests): code maintance
chore(package): use upstream mwc_core again