vendor tests and model finished
merge successful and tests for user and admin complete