First update, changes to core and update of test implementation