Recovered errors/core_test and edited tests