Bugfix to coreectly parse selectors with functions
Re-enable tests