Added tests and implemented viewing of only activated users