Some minor cleaning up [ci skip].
Added some tests for the Core plugin.