Add user test

Merging branches