Updated tests and core