A lot of work on plugin features (+tests)