fixing core system tests