Extended PSA classes, added tests, fixed settings test