Latest changes fixed some issues with test and added IsEnabled to user db