Small changes in processor, fix tests