Fix for failing “notification reads” test
Fixed failing “verify userid in message id” test
Cleaned up folders rest model