Some minor formatting fixed in core.py and some further testing methods
Clean up variants -> no real code changes