Improve test cases and implement user methods