Add more simulation methods and enrich the test case