Some bugfixes + updated tests for deprecated inputs