fixed some false positives for unused parameters, added tests