Added unit tests, updated user view