More test for core added + some improvements.