Added user filter. Unit tests