Updated users controller and model + added & updated some tests