Improved tests for core