added test signals
added tests to user.py
fixed merge