Add some requirements and test cases