Added UnitTests to UserControll, updated user-view