Updated core test
Some tweaks and bug fixes