wrote test result and added some requirements
merge conflict