Added tests, parameter to triggered method, removed @synchronized