Fixed core/tests