Added a component test. User list bugs should be fixed.
Perhaps final changes?
Merge remote-tracking branch 'upstream/master'