Helper Tests

Finally, some helper tests and a couple changes to UserHelper