updated tests cases and added test helpers
updated tests cases and added test helpers