fixcore
tests
