fixed core and test