Adding More tests and user